Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <[email protected]>
Wed, 12 Jan 2011 22:46:37 +0000 (23:46 +0100)
committerWolfgang Denk <[email protected]>
Wed, 12 Jan 2011 22:46:37 +0000 (23:46 +0100)

Trivial merge